d03a33411d86403f6d07d790aa65282e07f33b57,core/data/src/main/java/uk/gov/gchq/gaffer/data/elementdefinition/view/View.java,BaseBuilder,merge,#View#,131

Before Change


                        entity(entry.getKey(), entry.getValue());
                    } else {
                        final ViewElementDefinition mergedElementDef = new ViewElementDefinition.Builder()
                                .merge(getThisView().entities.get(entry.getKey()))
                                .merge(entry.getValue())
                                .build();
                        getThisView().entities.put(entry.getKey(), mergedElementDef);

After Change


                        entity(entry.getKey(), entry.getValue());
                    } else {
                        final ViewElementDefinition mergedElementDef = new ViewElementDefinition.Builder()
                                .merge(getThisView().getEntities().get(entry.getKey()))
                                .merge(entry.getValue())
                                .build();
                        getThisView().getEntities().put(entry.getKey(), mergedElementDef);